Rename gtk-update-icon-cache and gtk-builder-convert back
authorMatthias Clasen <mclasen@redhat.com>
Tue, 4 Jan 2011 02:31:55 +0000 (21:31 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 4 Jan 2011 02:35:23 +0000 (21:35 -0500)
commita975d62071d71814eb9e6b3c379228f4cd66f0d3
treef4daface2716fb0e8f6daba15f3d4e3ce76cafc8
parent7266d0f11fb25e27e51026fabe976de2c105a9eb
Rename gtk-update-icon-cache and gtk-builder-convert back

In bug 635207, it was pointed out that it is a bad idea to
rename these tools purely in the name of parallel-installability,
since it forces dependencies to make a choice between running
gtk-update-icon-cache and gtk-update-icon-cache-3.0 (or both ?!).

So, we rename these utilities back to their un-suffixed names
and rely on distributors to resolve the conflict between GTK+ 2.x
and GTK+ 3.0 packages, which can be done e.g. by dropping the
utilities from the gtk3 packages and add a gtk3 -> gtk2 dependency.
docs/reference/gtk/Makefile.am
docs/reference/gtk/gtk-builder-convert-3.0.xml [deleted file]
docs/reference/gtk/gtk-builder-convert.xml [new file with mode: 0644]
docs/reference/gtk/gtk-docs.sgml
docs/reference/gtk/gtk-update-icon-cache-3.0.xml [deleted file]
docs/reference/gtk/gtk-update-icon-cache.xml [new file with mode: 0644]
gtk/Makefile.am
gtk/gtk-builder-convert [new file with mode: 0755]
gtk/gtk-builder-convert-3.0 [deleted file]
modules/input/Makefile.am